Refactor of docker PR #11405 #336
Conversation
| //Gets the IP version in use ( [ipv4], [ipv6] or [ipv4 and ipv6] ) | ||
| func getIPVersion(config *networkConfiguration) ipVersion { | ||
| ipVersion := ipv4 | ||
| if config.FixedCIDR != nil || config.EnableIPv6 { |
There was a problem hiding this comment.
Should this be FixedCIDRv6 ?
alecbenson
force-pushed
the
check-kernel-params
branch
from
68d1fc4 to
842f2e3
Compare
|
@aboch Thanks for looking this over. I just made both of the changes that you suggested. |
alecbenson
force-pushed
the
check-kernel-params
branch
from
842f2e3 to
11a8885
Compare
|
I just realized in docker/docker PR #11405 @minimar also added some test code. Could you please port that one as well, so we do not leave anything out. Thanks. |
alecbenson
force-pushed
the
check-kernel-params
branch
from
11a8885 to
addb20d
Compare
|
Sure -- the test has been included now. |
|
Thanks for porting the patch to libnetwork. LGTM |
|
Any chance somebody could merge this in? |
| if err != nil { | ||
| if ptherr, ok := err.(*os.PathError); ok { | ||
| if errno, ok := ptherr.Err.(syscall.Errno); ok && errno == syscall.ENOENT { | ||
| if netutils.IsRunningInContainer() { |
There was a problem hiding this comment.
IsRunningInContainer cannot be reliably used outside libnetwork test framework. This needs special environment variables to be set up and this is not going to work when libnetwork is used in docker. So this part of the code needs to be redesigned so that this function works everywhere.
alecbenson
force-pushed
the
check-kernel-params
branch
2 times, most recently
from
f23b441 to
0e373fc
Compare
Signed-off-by: Alec Benson <albenson@redhat.com>
alecbenson
force-pushed
the
check-kernel-params
branch
from
0e373fc to
ec88bd0
Compare
|
@mrjana |
|
Thanks @alecbenson. LGTM now |
This is a port of docker PR #11405 code into the libnetwork codebase.
It will solve docker issue #11404.
Signed-off-by: Alec Benson albenson@redhat.com